Add deprecation guards for deprecated grab APIs

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index c7732f35de571df529dd01ee7990b84440ab1870..4307bd95249ee12b2fcac8d04f3955bbe548ce45 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -132,11 +132,13 @@ GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
 GdkScreen * gdk_display_get_default_screen (GdkDisplay  *display);
 
 #ifndef GDK_MULTIDEVICE_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 void        gdk_display_pointer_ungrab     (GdkDisplay  *display,
                                             guint32      time_);
 void        gdk_display_keyboard_ungrab    (GdkDisplay  *display,
                                             guint32      time_);
 gboolean    gdk_display_pointer_is_grabbed (GdkDisplay  *display);
+#endif /* GDK_DISABLE_DEPRECATED */
 #endif /* GDK_MULTIDEVICE_SAFE */
 
 gboolean    gdk_display_device_is_grabbed  (GdkDisplay  *display,

diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index 7b6c624b08e8ec14682c9f150722d0631398fde9..963654236b257b538a1043db6ff53bd212ad598b 100644 (file)
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -71,14 +71,16 @@ G_CONST_RETURN gchar *gdk_get_display_arg_name (void);
 /**
  * gdk_get_display:
  *
- * Gets the name of the display, which usually comes from the <envar>DISPLAY</envar>
- * environment variable or the <option>--display</option> command line option.
+ * Gets the name of the display, which usually comes from the
+ * <envar>DISPLAY</envar> environment variable or the
+ * <option>--display</option> command line option.
  *
  * Returns: the name of the display.
  */
-gchar*               gdk_get_display          (void);
+gchar*        gdk_get_display        (void);
 
 #ifndef GDK_MULTIDEVICE_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 GdkGrabStatus gdk_pointer_grab       (GdkWindow    *window,
                                      gboolean      owner_events,
                                      GdkEventMask  event_mask,
@@ -88,6 +90,7 @@ GdkGrabStatus gdk_pointer_grab       (GdkWindow    *window,
 GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
                                      gboolean      owner_events,
                                      guint32       time_);
+#endif /* GDK_DISABLE_DEPRECATED */
 #endif /* GDK_MULTIDEVICE_SAFE */
 
 #ifndef GDK_MULTIHEAD_SAFE